gh-127111: Emscripten Make web example work again #127113
Open
+83
−56
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hoodmane
requested review from
brettcannon,
freakboy3742,
erlend-aasland and
corona10
as code owners
hoodmane
commented
Nov 21, 2024
Comment on lines
-17
to
-22
| extensions_map = server.SimpleHTTPRequestHandler.extensions_map.copy() | ||
| extensions_map.update( | ||
| { | ||
| ".wasm": "application/wasm", | ||
| } | ||
| ) |
There was a problem hiding this comment.
This is now the default behavior of SimpleHTTPRequestHandler.
hoodmane
commented
Nov 21, 2024
| @@ -2321,14 +2325,14 @@ AS_CASE([$ac_sys_system], | |||
| AS_VAR_IF([Py_DEBUG], [yes], [wasm_debug=yes], [wasm_debug=no]) | |||
|
|
|||
| dnl Start with 20 MB and allow to grow | |||
| AS_VAR_APPEND([LDFLAGS_NODIST], [" -sALLOW_MEMORY_GROWTH -sTOTAL_MEMORY=20971520"]) | |||
| AS_VAR_APPEND([LDFLAGS_NODIST], [" -sALLOW_MEMORY_GROWTH -sINITIAL_MEMORY=20971520"]) | |||
There was a problem hiding this comment.
This setting has changed names. It's not really relevant to this PR, I could separate it into a separate NFC commit.
hoodmane
force-pushed
the
web-example
branch
from
215c295
to
525223d
Compare
hoodmane
commented
Nov 21, 2024
| dnl map int64_t and uint64_t to JS bigint | ||
| AS_VAR_APPEND([LDFLAGS_NODIST], [" -sWASM_BIGINT"]) | ||
| dnl Include file system support | ||
| AS_VAR_APPEND([LDFLAGS_NODIST], [" -sFORCE_FILESYSTEM -lidbfs.js -lnodefs.js -lproxyfs.js -lworkerfs.js"]) | ||
| AS_VAR_APPEND([LDFLAGS_NODIST], [" -sEXPORTED_RUNTIME_METHODS=FS"]) | ||
| AS_VAR_APPEND([LDFLAGS_NODIST], [" -sEXPORTED_RUNTIME_METHODS=FS,callMain"]) |
There was a problem hiding this comment.
We use callMain in python.worker.mjs now so we need to ask for it to be exported.
hoodmane
commented
Nov 21, 2024
| @@ -2339,7 +2343,6 @@ AS_CASE([$ac_sys_system], | |||
| AS_VAR_APPEND([LDFLAGS_NODIST], [" -sUSE_PTHREADS"]) | |||
| AS_VAR_APPEND([LINKFORSHARED], [" -sPROXY_TO_PTHREAD"]) | |||
| ]) | |||
| AS_VAR_APPEND([LDFLAGS_NODIST], [" -sALLOW_MEMORY_GROWTH"]) | |||
There was a problem hiding this comment.
We also set this on line 2328. It's harmless but unnecessary to set it twice.
hoodmane
force-pushed
the
web-example
branch
from
525223d
to
715455e
Compare
I moved the web example from `Tools/wasm` into `Tools/wasm/emscripten/web_example`. I also added a new target `build_emscripten` which is `build_wasm` but also builds the web_example. The web_example needs: 1. python.html, copied 2. python.worker.mjs copied 3. python.mjs and python.wasm output from the main linking of the Python interpreter 4. The webserver that sets COOP and COEP 5. python3.14.zip This last is created by the `wasm_assets.py` script, which required a pretty small set of changes to work fine for us. The last thing that should be done is the `python.worker.mjs` script should be made independent of the Python version: currently 3.14 is hard coded. I ran into trouble doing this, so maybe I can leave it to a followup.
hoodmane
force-pushed
the
web-example
branch
from
715455e
to
bbb2ab9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I moved the web example from
Tools/wasmintoTools/wasm/emscripten/web_example. I also added a new targetbuild_emscriptenwhich isbuild_wasmbut also builds the web_example. The web_example needs:This last is created by the
wasm_assets.pyscript, which required a pretty small set of changes to work fine for us.The last thing that should be done is the
python.worker.mjsscript should be made independent of the Python version: currently 3.14 is hard coded. I ran into trouble doing this, so maybe I can leave it to a followup.